Autogenerated HTML docs for v2.10.1-502-g65988
diff --git a/git-mergetool.txt b/git-mergetool.txt index e846c2e..3622d66 100644 --- a/git-mergetool.txt +++ b/git-mergetool.txt
@@ -79,6 +79,13 @@ Prompt before each invocation of the merge resolution program to give the user a chance to skip the path. +-O<orderfile>:: + Process files in the order specified in the + <orderfile>, which has one shell glob pattern per line. + This overrides the `diff.orderFile` configuration variable + (see linkgit:git-config[1]). To cancel `diff.orderFile`, + use `-O/dev/null`. + TEMPORARY FILES --------------- `git mergetool` creates `*.orig` backup files while resolving merges.
